diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc | 1 | ||||
| -rw-r--r-- | data/maps/LittlerootTown_BrendansHouse_2F/map.json | 2 | ||||
| -rw-r--r-- | data/maps/LittlerootTown_MaysHouse_2F/map.json | 2 | ||||
| -rw-r--r-- | data/maps/OldaleTown_Mart/scripts.inc | 1 | ||||
| -rw-r--r-- | data/maps/RustboroCity_Mart/scripts.inc | 1 | ||||
| -rw-r--r-- | data/maps/SlateportCity/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SlateportCity_Mart/scripts.inc | 1 | ||||
| -rw-r--r-- | data/maps/SootopolisCity_Mart/scripts.inc | 1 | ||||
| -rw-r--r-- | data/scripts/new_game.inc | 2 |
9 files changed, 10 insertions, 3 deletions
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc index ddb927519..20480068b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -11,6 +11,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft:: release end + .align 2 LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins: .2byte ITEM_PROTEIN .2byte ITEM_CALCIUM diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 03e2dcd82..c938aaae2 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -194,7 +194,7 @@ "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM" }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 1fa2ff01d..080eb0fe5 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -194,7 +194,7 @@ "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM" }, { "graphics_id": "OBJ_EVENT_GFX_PICHU_DOLL", diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index fa97dfe8d..0b3c7b1a3 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -12,6 +12,7 @@ OldaleTown_Mart_EventScript_Clerk:: release end + .align 2 OldaleTown_Mart_Pokemart_Basic: .2byte ITEM_POTION .2byte ITEM_ANTIDOTE diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index 91ffafdda..18120cb4d 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -16,6 +16,7 @@ RustboroCity_Mart_EventScript_PokemartBasic:: release end + .align 2 RustboroCity_Mart_Pokemart_Basic: .2byte ITEM_POKE_BALL .2byte ITEM_POTION diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 0f7057359..4a5671714 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -147,6 +147,7 @@ SlateportCity_EventScript_EnergyGuru:: release end + .align 2 SlateportCity_Pokemart_EnergyGuru: .2byte ITEM_PROTEIN .2byte ITEM_IRON @@ -543,6 +544,7 @@ SlateportCity_EventScript_DecorClerk:: release end + .align 2 SlateportCity_PokemartDecor: .2byte DECOR_RED_BRICK .2byte DECOR_BLUE_BRICK diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc index bd5fc3b55..a0c0a8612 100644 --- a/data/maps/SlateportCity_Mart/scripts.inc +++ b/data/maps/SlateportCity_Mart/scripts.inc @@ -11,6 +11,7 @@ SlateportCity_Mart_EventScript_Clerk:: release end + .align 2 SlateportCity_Mart_Pokemart: .2byte ITEM_POKE_BALL .2byte ITEM_GREAT_BALL diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index 69e5407cb..0975abd2b 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -11,6 +11,7 @@ SootopolisCity_Mart_EventScript_Clerk:: release end + .align 2 SootopolisCity_Mart_Pokemart: .2byte ITEM_ULTRA_BALL .2byte ITEM_HYPER_POTION diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index f31cedc80..7c5c3fc7d 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -209,7 +209,7 @@ EventScript_ResetAllMapFlags:: setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS |