Update 6.8

Data/Scripts/052_InfiniteFusion/Gameplay/Overworld/PokeMart.rb

@@ -28,11 +28,30 @@ def get_city_numerical_id(city_sym)
   return current_city_numerical[city_sym]
 end
 
+# POKEMON_CENTER_MAP = 25
+# POKEMON_CENTER_DOOR_POS = [10,10]
+# POKEMON_CENTER_BIRTHDAY_MAP = 27
+# def enter_pokemon_center
+#   pbSetPokemonCenter
+#   pokemon_center_map = isPlayerBirthDay? ? POKEMON_CENTER_BIRTHDAY_MAP : POKEMON_CENTER_MAP
+#   pbFadeOutIn {
+#     $game_temp.player_new_map_id = pokemon_center_map
+#     $game_temp.player_new_x = POKEMON_CENTER_DOOR_POS[0]
+#     $game_temp.player_new_y = POKEMON_CENTER_DOOR_POS[1]
+#     $scene.transfer_player(true)
+#     $game_map.autoplay
+#     $game_map.refresh
+#   }
+# end
+
+
+
 POKEMART_MAP_ID = 357
 POKEMART_DOOR_POS = [12, 12]
 # city -> Symbol
+# used only in pif:kanto
 def enter_pokemart(city)
-  pbSet(VAR_CURRENT_MART, city)
+  pbSet(VAR_CURRENT_CITY, city)
   pbSet(VAR_CURRENT_CITY_NUMERICAL_ID, get_city_numerical_id(city))
   echoln get_city_numerical_id(city)
   pbFadeOutIn {
@@ -67,7 +86,7 @@ def exit_pokemart()
     :OLIVINE => [138, 33, 23],
     :CIANWOOD => [709.8, 46],
   }
-  current_city = pbGet(VAR_CURRENT_MART)
+  current_city = pbGet(VAR_CURRENT_CITY)
   current_city = :PEWTER if !current_city.is_a?(Symbol)
 
   entrance_map = pokemart_entrances[current_city][0]
@@ -88,11 +107,16 @@ end
 
 def reset_pokemart_variables
   pbSet(VAR_CURRENT_CITY_NUMERICAL_ID, 0)
-  pbSet(VAR_CURRENT_MART, 0)
+  pbSet(VAR_CURRENT_CITY, 0)
+end
+
+def get_current_city_tag()
+  current_city = pbGet(VAR_CURRENT_CITY) if !current_city
+  current_city = :PEWTER if !current_city.is_a?(Symbol)
+  current_city_tag = current_city.to_s.downcase
 end
 def pokemart_clothes_shop(current_city = nil, include_defaults = true)
-  current_city = pbGet(VAR_CURRENT_MART) if !current_city
-  echoln current_city
+  current_city = pbGet(VAR_CURRENT_CITY) if !current_city
   current_city = :PEWTER if !current_city.is_a?(Symbol)
   current_city_tag = current_city.to_s.downcase
   selector = OutfitSelector.new
@@ -105,7 +129,7 @@ def pokemart_clothes_shop(current_city = nil, include_defaults = true)
 end
 
 def pokemart_hat_shop(include_defaults = true)
-  current_city = pbGet(VAR_CURRENT_MART)
+  current_city = pbGet(VAR_CURRENT_CITY)
   current_city = :PEWTER if !current_city.is_a?(Symbol)
   current_city_tag = current_city.to_s.downcase
   selector = OutfitSelector.new
@@ -119,7 +143,7 @@ def pokemart_hat_shop(include_defaults = true)
 end
 
 def get_mart_exclusive_items(city)
-  return get_mart_exclusive_items_hoenn if Settings::GAME_ID == :IF_HOENN
+  return get_mart_exclusive_items_hoenn(city) if Settings::GAME_ID == :IF_HOENN
   items_list = []
   case city
   when :PEWTER;
@@ -170,4 +194,73 @@ def get_mart_exclusive_items(city)
     items_list = []
   end
   return items_list
+end
+
+def get_mart_exclusive_items_hoenn(city)
+  items_list = []
+  case city
+  when :OLDALE
+    items_list = [:BERRYJUICE]
+  when :PETALBURG
+    items_list = [:POKETOY, :NESTBALL]
+  when :RUSTBORO
+    items_list = [:EVERSTONE, :LEVELBALL]
+  when :DEWFORD
+    items_list = [:RINGTARGET, :LUREBALL]
+  when :SLATEPORT
+    items_list = [:SOOTHEBELL, :NETBALL]
+  when :MAUVILLE
+    items_list = [:CELLBATTERY, :FASTBALL]
+  when :VERDANTURF
+    items_list = [:MENTALHERB, :LUXURYBALL]
+  when :LAVARIDGE
+    items_list = [:LAVACOOKIE, :REPEATBALL]
+  when :FALLARBOR
+    items_list = [:LIGHTCLAY, :HEAVYBALL]
+  when :FORTREE
+    items_list = [:ABSORBBULB, :FRIENDBALL]
+  when :LILYCOVE
+    items_list = [:METRONOME, :QUICKBALL,:TIMERBALL]
+  when :MOSSDEEP
+    items_list = [:AIRBALLOON, :MOONBALL]
+  when :SOOTOPOLIS
+    items_list = [:CLEANSETAG, :DUSKBALL]
+  when :EVERGRANDE
+    items_list = [:ABILITYURGE, :PUREBALL]
+  when :PACIFIDLOG
+    items_list = [:FLOATSTONE, :DIVEBALL]
+  end
+  return items_list
+end
+
+
+
+def regional_clothes_shop(regionTag)
+  selector = OutfitSelector.new
+  list = selector.generate_clothes_choice(
+    baseOptions = false,
+    additionalIds = [],
+    additionalTags = [regionTag],
+    filterOutTags = [])
+  clothesShop(list)
+end
+
+def regional_hats_shop(regionTag)
+  selector = OutfitSelector.new
+  list = selector.generate_hats_choice(
+    baseOptions = false,
+    additionalIds = [],
+    additionalTags = [regionTag],
+    filterOutTags = [])
+  hatShop(list)
+end
+
+def regional_hairstyle_shop(regionTag)
+  selector = OutfitSelector.new
+  list = selector.generate_hairstyle_choice(
+    baseOptions = false,
+    additionalIds = [],
+    additionalTags = [regionTag],
+    filterOutTags = [])
+  hairShop(list)
 end