diff --git a/args/arguments.py b/args/arguments.py index eb6a97ad..cc372d13 100644 --- a/args/arguments.py +++ b/args/arguments.py @@ -59,6 +59,10 @@ def __init__(self): # if no output_file given add seed to output name name, ext = os.path.splitext(self.input_file) self.output_file = f"{name}_wc_{self.seed}{ext}" + elif os.path.isdir(self.output_file): + name, ext = os.path.splitext(os.path.basename(self.input_file)) + # If output_file is a directory, construct the full path with above filename + self.output_file = os.path.join(self.output_file, f"{name}_wc_{self.seed}{ext}") if self.debug: self.spoiler_log = True diff --git a/args/coliseum.py b/args/coliseum.py index 9fe9ce27..5bc66db4 100644 --- a/args/coliseum.py +++ b/args/coliseum.py @@ -41,12 +41,12 @@ def flags(args): if args.coliseum_opponents_random: flags += f" -cor {args.coliseum_opponents_random}" elif args.coliseum_opponents_shuffle_random: - flags += f" -cor {args.coliseum_opponents_shuffle_random}" + flags += f" -cosr {args.coliseum_opponents_shuffle_random}" if args.coliseum_rewards_random: flags += f" -crr {args.coliseum_rewards_random}" elif args.coliseum_rewards_shuffle_random: - flags += f" -crr {args.coliseum_rewards_shuffle_random}" + flags += f" -crsr {args.coliseum_rewards_shuffle_random}" if args.coliseum_rewards_visible_random: flags += f" -crvr {args.coliseum_rewards_visible_random_min} {args.coliseum_rewards_visible_random_max}" @@ -64,28 +64,45 @@ def flags(args): def options(args): result = [] - opponents = "Original" + # if Coliseum opponents are random if args.coliseum_opponents_random: - opponents = "Random" + result.append(("Opponents", "Random", "opponents")) + result.append((" Random", f"{args.coliseum_opponents_random}%","coliseum_opponents_random")) + # if Coliseum opponents are shuffle + random + elif args.coliseum_opponents_shuffle_random: + result.append(("Opponents", "Random", "opponents")) + result.append((" Shuffle + Random", f"{args.coliseum_opponents_shuffle_random}%","coliseum_opponents_shuffle_random")) + # else Coliseum opponents are Original + else: + result.append(("Opponents", "Original", "opponents")) - rewards = "Original" + # if Coliseum rewards are random if args.coliseum_rewards_random: - rewards = "Random" + result.append(("Rewards", "Random", "rewards")) + result.append((" Random", f"{args.coliseum_rewards_random}%","coliseum_rewards_random")) + # if Coliseum opponents are shuffle + random + elif args.coliseum_rewards_shuffle_random: + result.append(("Rewards", "Random", "rewards")) + result.append((" Shuffle + Random", f"{args.coliseum_rewards_shuffle_random}%","coliseum_rewards_shuffle_random")) + # else Coliseum opponents are Original + else: + result.append(("Rewards", "Original", "rewards")) + # process rewards menu options rewards_visible = "Original" if not args.coliseum_rewards_menu: rewards_visible = "F" else: if args.coliseum_rewards_visible_random: rewards_visible = f"{args.coliseum_rewards_visible_random_min}-{args.coliseum_rewards_visible_random_max}" - - return [ - ("Opponents", opponents, "opponents"), - ("Rewards", rewards, "rewards"), - ("Rewards Visible", rewards_visible, "rewards_visible"), - ("No Exp. Eggs", args.coliseum_no_exp_eggs, "coliseum_no_exp_eggs"), - ("No Illuminas", args.coliseum_no_illuminas, "coliseum_no_illuminas"), - ] + # update Coliseum menu display + result.append(("Rewards Visible", rewards_visible, "rewards_visible")) + # update Coliseum Exp Eggs display + result.append(("No Exp. Eggs", args.coliseum_no_exp_eggs, "coliseum_no_exp_eggs")) + # update Coliseum Illuminas display + result.append(("No Illuminas", args.coliseum_no_illuminas, "coliseum_no_illuminas")) + + return result def menu(args): return (name(), options(args)) diff --git a/args/misc.py b/args/misc.py index 99e11095..6c8d1afd 100644 --- a/args/misc.py +++ b/args/misc.py @@ -73,6 +73,8 @@ def flags(args): flags += f" -move {args.movement}" if args.original_name_display: flags += " -ond" + if args.scan_all: + flags += " -scan" if args.warp_all: flags += " -warp" if args.npc_dialog_tips: diff --git a/args/shops.py b/args/shops.py index 779a1e49..ef76be8a 100644 --- a/args/shops.py +++ b/args/shops.py @@ -29,7 +29,7 @@ def parse(parser): shops_sell_fraction.add_argument("-ssf0", "--shop-sell-fraction0", action = "store_true", help = "Items sell for zero") - shops.add_argument("-sdm", "--shop-dried-meat", default = 1, type = int, choices = range(6), metavar = "COUNT", + shops.add_argument("-sdm", "--shop-dried-meat", default = 1, type = int, choices = range(11), metavar = "COUNT", help = "%(metavar)s shops will contain dried meat") shops.add_argument("-npi", "--no-priceless-items", action = "store_true", help = "Assign values to items which normally sell for 1 gold. Recommended with random inventory") diff --git a/data/enemy_packs.py b/data/enemy_packs.py index dae38805..291f84e2 100644 --- a/data/enemy_packs.py +++ b/data/enemy_packs.py @@ -150,9 +150,11 @@ def randomize_event_bosses(self): from constants.objectives.conditions import names as possible_condition_names boss_condition_name = "Boss" + bosses_condition_name = "Bosses" dragon_condition_name = "Dragon" dragons_condition_name = "Dragons" assert boss_condition_name in possible_condition_names + assert bosses_condition_name in possible_condition_names assert dragon_condition_name in possible_condition_names assert dragons_condition_name in possible_condition_names @@ -160,6 +162,7 @@ def randomize_event_bosses(self): required_dragon_formations = set() required_statue_formations = set() + min_boss_formations = 0 min_dragon_formations = 0 for objective in objectives: for condition in objective.conditions: @@ -169,15 +172,41 @@ def randomize_event_bosses(self): required_statue_formations.add(formation) else: required_boss_formations.add(formation) + # if this condition is a set number of bosses, make sure we always get the highest amount for the minimum req # of formations + elif condition.NAME == bosses_condition_name and condition.count > min_boss_formations: + min_boss_formations = condition.count elif condition.NAME == dragon_condition_name: required_dragon_formations.add(condition.dragon_formation) elif condition.NAME == dragons_condition_name and condition.count > min_dragon_formations: min_dragon_formations = condition.count + # amount of bosses needed is the minimum from above minus the required bosses + required statues + boss_formations_needed = min_boss_formations - (len(required_boss_formations) + len(required_statue_formations)) + # if the extra required number needed non-zero + if boss_formations_needed > 0: + # initialize all boss formations set + all_boss_formations = set(bosses.normal_formation_name) + # remaining bosses is all bosses - required bosses | required statues + required_formations = set(required_boss_formations | required_statue_formations) + remaining_boss_formations = sorted(all_boss_formations - required_formations) + # the random boss formation list is a sample of the remaining bosses for the amount needed to fulfill objectives + random_boss_formations = random.sample(remaining_boss_formations, boss_formations_needed) + # add these boss formations into the appropriate set + # (required_boss_formations or required_statue_formations) + for formation_id in random_boss_formations: + # if this formation is a statue + if formation_id in bosses.statue_formation_name: + # add to required statue formations + required_statue_formations.add(formation_id) + # else a regular boss + else: + # add to required boss formations + required_boss_formations.add(formation_id) + dragon_formations_needed = min_dragon_formations - len(required_dragon_formations) if dragon_formations_needed > 0: all_dragon_formations = set(bosses.dragon_formation_name) - remaining_dragon_formations = list(all_dragon_formations - required_dragon_formations) + remaining_dragon_formations = sorted(all_dragon_formations - required_dragon_formations) random_dragon_formations = random.sample(remaining_dragon_formations, dragon_formations_needed) required_dragon_formations |= set(random_dragon_formations) diff --git a/data/espers.py b/data/espers.py index 11f25ee0..d9c6708e 100644 --- a/data/espers.py +++ b/data/espers.py @@ -345,7 +345,7 @@ def get_random_esper(self): if not self.available_espers: return None - rand_esper = random.sample(self.available_espers, 1)[0] + rand_esper = random.sample(sorted(self.available_espers), 1)[0] self.available_espers.remove(rand_esper) return rand_esper diff --git a/data/shops.py b/data/shops.py index a78d4c0b..201b4c58 100644 --- a/data/shops.py +++ b/data/shops.py @@ -145,11 +145,16 @@ def clear_inventories(self): def assign_dried_meats(self): dried_meat_id = self.items.get_id("Dried Meat") dried_meat_type = self.items.get_type(dried_meat_id) + excluded_shops = ["Figaro Castle WOR (Left)","Figaro Castle WOR (Right)","Phantom Train"] dried_meat_shops = [] no_dried_meat_shops = [] + for shop in self.shops: - if shop.contains(dried_meat_id): + if shop.contains(dried_meat_id) and shop.name() in excluded_shops: + shop.remove(dried_meat_id) + no_dried_meat_shops.append(shop) + elif shop.contains(dried_meat_id): dried_meat_shops.append(shop) elif shop.type == Shop.ITEM or shop.type == Shop.VENDOR: no_dried_meat_shops.append(shop) @@ -167,50 +172,18 @@ def assign_dried_meats(self): # add a dried meat if space, otherwise replace a random item with dried meat for index in range(number_shops_with_dried_meat, self.args.shop_dried_meat): random_shop = random.choice(no_dried_meat_shops) + + while random_shop.name() in excluded_shops: # keep looping if shop is on the "bad" list + random_shop = random.choice(no_dried_meat_shops) + if not random_shop.full(): random_shop.append(dried_meat_id) else: random_index = random.randrange(random_shop.item_count) random_shop.items[random_index] = dried_meat_id no_dried_meat_shops.remove(random_shop) + dried_meat_shops.append(random_shop) - def no_dried_meat_phantom_train(self): - # move dried meat from phantom train shop to a different shop - phantom_train_shop_id = 85 - phantom_train_shop = self.all_shops[phantom_train_shop_id] - - dried_meat_id = self.items.get_id("Dried Meat") - dried_meat_type = self.items.get_type(dried_meat_id) - dried_meat_index = phantom_train_shop.index(dried_meat_id) - if dried_meat_index is None: - return # phantom train shop does not have dried meat - - # possible shops the dried meat can be moved to - possible_shops = self.type_shops[Shop.ITEM] + self.type_shops[Shop.VENDOR] - - import random - random.shuffle(possible_shops) - - for random_shop in possible_shops: - if random_shop.contains(dried_meat_id): - continue - - # try to swap an empty slot with the dried meat - if not random_shop.full(): - random_shop.append(dried_meat_id) - phantom_train_shop.remove(dried_meat_id) - return - - # try to find an item in random_shop that phantom train does not have and swap them - item_indices = list(range(random_shop.item_count)) - random.shuffle(item_indices) - for item_index in item_indices: - item = random_shop.items[item_index] - item_type = self.items.get_type(item) - if item_type == dried_meat_type and not phantom_train_shop.contains(item): - phantom_train_shop.items[dried_meat_index] = item - random_shop.items[item_index] = dried_meat_id - return def remove_excluded_items(self): exclude = self.items.get_excluded() diff --git a/event/event_reward.py b/event/event_reward.py index ce722994..e14b6d1b 100644 --- a/event/event_reward.py +++ b/event/event_reward.py @@ -1,4 +1,5 @@ from enum import Flag, unique, auto +from typing import Collection @unique class RewardType(Flag): NONE = auto() @@ -15,6 +16,10 @@ def __init__(self, event, possible_types): self.possible_types = possible_types def single_possible_type(self): + # python version difference -- in 3.9, "self.possible_types in RewardType" will only be true if there's a single reward and self.possible_types would not be a collection + # however, in python 3.12+, Collections of objects are also considered that object, so it would always be true even with multiple rewards, so we have to check the length + if (isinstance(self.possible_types, Collection)): + return len(self.possible_types) == 1 return self.possible_types in RewardType def __str__(self): diff --git a/event/mt_zozo.py b/event/mt_zozo.py index fe54b824..6b43c0b8 100644 --- a/event/mt_zozo.py +++ b/event/mt_zozo.py @@ -8,10 +8,7 @@ def character_gate(self): return self.characters.CYAN def init_rewards(self): - if self.args.no_free_characters_espers: - self.reward = self.add_reward(RewardType.ITEM) - else: - self.reward = self.add_reward(RewardType.CHARACTER | RewardType.ESPER | RewardType.ITEM) + self.reward = self.add_reward(RewardType.CHARACTER | RewardType.ESPER | RewardType.ITEM) def init_event_bits(self, space): space.write( diff --git a/event/phantom_train.py b/event/phantom_train.py index 1ddf3425..2f6a14de 100644 --- a/event/phantom_train.py +++ b/event/phantom_train.py @@ -54,12 +54,6 @@ def add_gating_condition(self): field.ReturnIfEventBitClear(event_bit.character_recruited(self.character_gate())), ) - sabin_path = self.characters.get_character_path(self.characters.SABIN) - veldt_gate = self.events["Veldt"].character_gate() - if veldt_gate in sabin_path and self.args.shop_dried_meat == 1: - # sabin requires veldt gate character and there is only one dried meat in shops - # make sure it is not in the phantom train - self.shops.no_dried_meat_phantom_train() def _load_world_map(self): src = [ @@ -82,6 +76,7 @@ def esper_item_mod(self, esper_item_instructions): esper_item_instructions, field.HideEntity(ghost_npc_id), + field.RefreshEntities(), field.SetEventBit(event_bit.GOT_PHANTOM_TRAIN_REWARD), field.FinishCheck(), field.Return(), @@ -100,6 +95,7 @@ def esper_item_mod(self, esper_item_instructions): space.write( field.ReturnIfEventBitClear(event_bit.GOT_PHANTOM_TRAIN_REWARD), field.HideEntity(ghost_npc_id), + field.RefreshEntities(), field.Return(), ) self.maps.set_entrance_event(0x98, inside_last_car_entrance_event - EVENT_CODE_START) diff --git a/graphics/palettes/custom/Alys-HoxNorf-PS4.pal b/graphics/palettes/custom/Alys-HoxNorf-PS4.pal new file mode 100644 index 00000000..4851ce72 Binary files /dev/null and b/graphics/palettes/custom/Alys-HoxNorf-PS4.pal differ diff --git a/graphics/palettes/custom/Bartz (Dancer)-HoxNorf-FF5.pal b/graphics/palettes/custom/Bartz (Dancer)-HoxNorf-FF5.pal new file mode 100644 index 00000000..077ebec1 Binary files /dev/null and b/graphics/palettes/custom/Bartz (Dancer)-HoxNorf-FF5.pal differ diff --git a/graphics/palettes/custom/Bow-HoxNorf-Mario.pal b/graphics/palettes/custom/Bow-HoxNorf-Mario.pal new file mode 100644 index 00000000..2d7d8a4b Binary files /dev/null and b/graphics/palettes/custom/Bow-HoxNorf-Mario.pal differ diff --git a/graphics/palettes/custom/Chaz-HoxNorf-PS4.pal b/graphics/palettes/custom/Chaz-HoxNorf-PS4.pal new file mode 100644 index 00000000..5e09ad2b Binary files /dev/null and b/graphics/palettes/custom/Chaz-HoxNorf-PS4.pal differ diff --git a/graphics/palettes/custom/Demi-HoxNorf-PS4.pal b/graphics/palettes/custom/Demi-HoxNorf-PS4.pal new file mode 100644 index 00000000..5407db8d Binary files /dev/null and b/graphics/palettes/custom/Demi-HoxNorf-PS4.pal differ diff --git a/graphics/palettes/custom/Falco-Badass-Starfox.pal b/graphics/palettes/custom/Falco-Badass-Starfox.pal new file mode 100644 index 00000000..92079fe9 Binary files /dev/null and b/graphics/palettes/custom/Falco-Badass-Starfox.pal differ diff --git a/graphics/palettes/custom/Flowey-pomariin-Undertale.pal b/graphics/palettes/custom/Flowey-pomariin-Undertale.pal new file mode 100644 index 00000000..7592dc7a --- /dev/null +++ b/graphics/palettes/custom/Flowey-pomariin-Undertale.pal @@ -0,0 +1 @@ +\c +ygK&S'Q6 \ No newline at end of file diff --git a/graphics/palettes/custom/Fox-CtrlxZ-Starfox.pal b/graphics/palettes/custom/Fox-CtrlxZ-Starfox.pal new file mode 100644 index 00000000..44b0d426 Binary files /dev/null and b/graphics/palettes/custom/Fox-CtrlxZ-Starfox.pal differ diff --git a/graphics/palettes/custom/Iffy-HoxNorf-Neptunia.pal b/graphics/palettes/custom/Iffy-HoxNorf-Neptunia.pal index 4af51132..7f4c4aa1 100644 Binary files a/graphics/palettes/custom/Iffy-HoxNorf-Neptunia.pal and b/graphics/palettes/custom/Iffy-HoxNorf-Neptunia.pal differ diff --git a/graphics/palettes/custom/Ike (Ranger)-HoxNorf-FE.pal b/graphics/palettes/custom/Ike (Ranger)-HoxNorf-FE.pal new file mode 100644 index 00000000..68d49c0d Binary files /dev/null and b/graphics/palettes/custom/Ike (Ranger)-HoxNorf-FE.pal differ diff --git a/graphics/palettes/custom/Kirby-HoxNorf-Kirby.pal b/graphics/palettes/custom/Kirby-HoxNorf-Kirby.pal new file mode 100644 index 00000000..7b9cfce1 Binary files /dev/null and b/graphics/palettes/custom/Kirby-HoxNorf-Kirby.pal differ diff --git a/graphics/palettes/custom/Lutz-HoxNorf-PS1.pal b/graphics/palettes/custom/Lutz-HoxNorf-PS1.pal new file mode 100644 index 00000000..5d8d7715 Binary files /dev/null and b/graphics/palettes/custom/Lutz-HoxNorf-PS1.pal differ diff --git a/graphics/palettes/custom/Marisa2-HoxNorf-Touhou.pal b/graphics/palettes/custom/Marisa2-HoxNorf-Touhou.pal new file mode 100644 index 00000000..8ea44bf6 Binary files /dev/null and b/graphics/palettes/custom/Marisa2-HoxNorf-Touhou.pal differ diff --git a/graphics/palettes/custom/Megumin-HoxNorf-Konosuba.pal b/graphics/palettes/custom/Megumin-HoxNorf-Konosuba.pal new file mode 100644 index 00000000..bebdd56c Binary files /dev/null and b/graphics/palettes/custom/Megumin-HoxNorf-Konosuba.pal differ diff --git a/graphics/palettes/custom/Meiling-HoxNorf-Touhou.pal b/graphics/palettes/custom/Meiling-HoxNorf-Touhou.pal new file mode 100644 index 00000000..9e69c3c7 Binary files /dev/null and b/graphics/palettes/custom/Meiling-HoxNorf-Touhou.pal differ diff --git a/graphics/palettes/custom/Miko-HoxNorf-Touhou.pal b/graphics/palettes/custom/Miko-HoxNorf-Touhou.pal new file mode 100644 index 00000000..b133e9ee Binary files /dev/null and b/graphics/palettes/custom/Miko-HoxNorf-Touhou.pal differ diff --git a/graphics/palettes/custom/Mokou-HoxNorf-Touhou.pal b/graphics/palettes/custom/Mokou-HoxNorf-Touhou.pal new file mode 100644 index 00000000..a0bd3102 Binary files /dev/null and b/graphics/palettes/custom/Mokou-HoxNorf-Touhou.pal differ diff --git a/graphics/palettes/custom/Olimar-HoxNorf-Pikmin.pal b/graphics/palettes/custom/Olimar-HoxNorf-Pikmin.pal new file mode 100644 index 00000000..86752b66 Binary files /dev/null and b/graphics/palettes/custom/Olimar-HoxNorf-Pikmin.pal differ diff --git a/graphics/palettes/custom/Purple Heart-HoxNorf-Neptunia.pal b/graphics/palettes/custom/Purple Heart-HoxNorf-Neptunia.pal new file mode 100644 index 00000000..9e674979 --- /dev/null +++ b/graphics/palettes/custom/Purple Heart-HoxNorf-Neptunia.pal @@ -0,0 +1 @@ +Bc oqW~Oe[>(da+IF-R:ZO \ No newline at end of file diff --git a/graphics/palettes/custom/Reimu (PC98)-HoxNorf-Touhou.pal b/graphics/palettes/custom/Reimu (PC98)-HoxNorf-Touhou.pal new file mode 100644 index 00000000..80e54aa6 Binary files /dev/null and b/graphics/palettes/custom/Reimu (PC98)-HoxNorf-Touhou.pal differ diff --git a/graphics/palettes/custom/Shulk-HoxNorf-Xenoblade.pal b/graphics/palettes/custom/Shulk-HoxNorf-Xenoblade.pal new file mode 100644 index 00000000..159e29ec Binary files /dev/null and b/graphics/palettes/custom/Shulk-HoxNorf-Xenoblade.pal differ diff --git a/graphics/palettes/custom/Tao-HoxNorf-Shining.pal b/graphics/palettes/custom/Tao-HoxNorf-Shining.pal new file mode 100644 index 00000000..2a2b75cb Binary files /dev/null and b/graphics/palettes/custom/Tao-HoxNorf-Shining.pal differ diff --git a/graphics/palettes/custom/Tewi-HoxNorf-Touhou.pal b/graphics/palettes/custom/Tewi-HoxNorf-Touhou.pal new file mode 100644 index 00000000..437ee6a4 Binary files /dev/null and b/graphics/palettes/custom/Tewi-HoxNorf-Touhou.pal differ diff --git a/graphics/palettes/custom/Toadette (Sailor)-HoxNorf-Mario.pal b/graphics/palettes/custom/Toadette (Sailor)-HoxNorf-Mario.pal new file mode 100644 index 00000000..11408488 Binary files /dev/null and b/graphics/palettes/custom/Toadette (Sailor)-HoxNorf-Mario.pal differ diff --git a/graphics/palettes/custom/Tycoon-HoxNorf-FF5.pal b/graphics/palettes/custom/Tycoon-HoxNorf-FF5.pal new file mode 100644 index 00000000..a607148c Binary files /dev/null and b/graphics/palettes/custom/Tycoon-HoxNorf-FF5.pal differ diff --git a/graphics/palettes/custom/Youmu-HoxNorf-Touhou.pal b/graphics/palettes/custom/Youmu-HoxNorf-Touhou.pal new file mode 100644 index 00000000..a5340f1a Binary files /dev/null and b/graphics/palettes/custom/Youmu-HoxNorf-Touhou.pal differ diff --git a/graphics/palettes/custom/Yukari-HoxNorf-Touhou.pal b/graphics/palettes/custom/Yukari-HoxNorf-Touhou.pal new file mode 100644 index 00000000..a73f86aa Binary files /dev/null and b/graphics/palettes/custom/Yukari-HoxNorf-Touhou.pal differ diff --git a/graphics/palettes/palettes.py b/graphics/palettes/palettes.py index 4fb8070d..840298cc 100644 --- a/graphics/palettes/palettes.py +++ b/graphics/palettes/palettes.py @@ -295,6 +295,32 @@ 357 : "Lenna (Thief)-HoxNorf-FF5", 358 : "Lenna (Summoner)-HoxNorf-FF5", 359 : "Lenna (Beastmaster)-HoxNorf-FF5", + 360 : "Purple Heart-HoxNorf-Neptunia", + 361 : "Reimu (PC98)-HoxNorf-Touhou", + 362 : "Mokou-HoxNorf-Touhou", + 363 : "Youmu-HoxNorf-Touhou", + 364 : "Kirby-HoxNorf-Kirby", + 365 : "Toadette (Sailor)-HoxNorf-Mario", + 366 : "Shulk-HoxNorf-Xenoblade", + 367 : "Miko-HoxNorf-Touhou", + 368 : "Flowey-pomariin-Undertale", + 369 : "Meiling-HoxNorf-Touhou", + 370 : "Olimar-HoxNorf-Pikmin", + 371 : "Tao-HoxNorf-Shining", + 372 : "Tycoon-HoxNorf-FF5", + 373 : "Chaz-HoxNorf-PS4", + 374 : "Alys-HoxNorf-PS4", + 375 : "Fox-CtrlxZ-Starfox", + 376 : "Falco-Badass-Starfox", + 377 : "Lutz-HoxNorf-PS1", + 378 : "Yukari-HoxNorf-Touhou", + 379 : "Demi-HoxNorf-PS4", + 380 : "Ike (Ranger)-HoxNorf-FE", + 381 : "Bartz (Dancer)-HoxNorf-FF5", + 382 : "Marisa2-HoxNorf-Touhou", + 383 : "Tewi-HoxNorf-Touhou", + 384 : "Bow-HoxNorf-Mario", + 385 : "Megumin-HoxNorf-Konosuba", } def get_path(id_): diff --git a/graphics/portraits/custom/Alys-HoxNorf-PS4.bin b/graphics/portraits/custom/Alys-HoxNorf-PS4.bin new file mode 100644 index 00000000..fc4055b9 Binary files /dev/null and b/graphics/portraits/custom/Alys-HoxNorf-PS4.bin differ diff --git a/graphics/portraits/custom/Alys-HoxNorf-PS4.pal b/graphics/portraits/custom/Alys-HoxNorf-PS4.pal new file mode 100644 index 00000000..0b754d5f Binary files /dev/null and b/graphics/portraits/custom/Alys-HoxNorf-PS4.pal differ diff --git a/graphics/portraits/custom/Bow-HoxNorf-Mario.bin b/graphics/portraits/custom/Bow-HoxNorf-Mario.bin new file mode 100644 index 00000000..969667c1 Binary files /dev/null and b/graphics/portraits/custom/Bow-HoxNorf-Mario.bin differ diff --git a/graphics/portraits/custom/Bow-HoxNorf-Mario.pal b/graphics/portraits/custom/Bow-HoxNorf-Mario.pal new file mode 100644 index 00000000..ae61bf31 Binary files /dev/null and b/graphics/portraits/custom/Bow-HoxNorf-Mario.pal differ diff --git a/graphics/portraits/custom/Chaz-HoxNorf-PS4.bin b/graphics/portraits/custom/Chaz-HoxNorf-PS4.bin new file mode 100644 index 00000000..787f3e33 Binary files /dev/null and b/graphics/portraits/custom/Chaz-HoxNorf-PS4.bin differ diff --git a/graphics/portraits/custom/Chaz-HoxNorf-PS4.pal b/graphics/portraits/custom/Chaz-HoxNorf-PS4.pal new file mode 100644 index 00000000..ede9ee15 Binary files /dev/null and b/graphics/portraits/custom/Chaz-HoxNorf-PS4.pal differ diff --git a/graphics/portraits/custom/Demi-HoxNorf-PS4.bin b/graphics/portraits/custom/Demi-HoxNorf-PS4.bin new file mode 100644 index 00000000..e87f09d9 Binary files /dev/null and b/graphics/portraits/custom/Demi-HoxNorf-PS4.bin differ diff --git a/graphics/portraits/custom/Demi-HoxNorf-PS4.pal b/graphics/portraits/custom/Demi-HoxNorf-PS4.pal new file mode 100644 index 00000000..66de0380 Binary files /dev/null and b/graphics/portraits/custom/Demi-HoxNorf-PS4.pal differ diff --git a/graphics/portraits/custom/Falco-JamesWhite89-Starfox.bin b/graphics/portraits/custom/Falco-JamesWhite89-Starfox.bin new file mode 100644 index 00000000..2541890d Binary files /dev/null and b/graphics/portraits/custom/Falco-JamesWhite89-Starfox.bin differ diff --git a/graphics/portraits/custom/Falco-JamesWhite89-Starfox.pal b/graphics/portraits/custom/Falco-JamesWhite89-Starfox.pal new file mode 100644 index 00000000..3777c591 Binary files /dev/null and b/graphics/portraits/custom/Falco-JamesWhite89-Starfox.pal differ diff --git a/graphics/portraits/custom/Flowey-pomariin-Undertale.bin b/graphics/portraits/custom/Flowey-pomariin-Undertale.bin new file mode 100644 index 00000000..ab2e11d0 Binary files /dev/null and b/graphics/portraits/custom/Flowey-pomariin-Undertale.bin differ diff --git a/graphics/portraits/custom/Flowey-pomariin-Undertale.pal b/graphics/portraits/custom/Flowey-pomariin-Undertale.pal new file mode 100644 index 00000000..4590d736 Binary files /dev/null and b/graphics/portraits/custom/Flowey-pomariin-Undertale.pal differ diff --git a/graphics/portraits/custom/Fox-JamesWhite89-Starfox.bin b/graphics/portraits/custom/Fox-JamesWhite89-Starfox.bin new file mode 100644 index 00000000..b4943591 Binary files /dev/null and b/graphics/portraits/custom/Fox-JamesWhite89-Starfox.bin differ diff --git a/graphics/portraits/custom/Fox-JamesWhite89-Starfox.pal b/graphics/portraits/custom/Fox-JamesWhite89-Starfox.pal new file mode 100644 index 00000000..10dd4d2e Binary files /dev/null and b/graphics/portraits/custom/Fox-JamesWhite89-Starfox.pal differ diff --git a/graphics/portraits/custom/Ike (Ranger)-HoxNorf-FE.bin b/graphics/portraits/custom/Ike (Ranger)-HoxNorf-FE.bin new file mode 100644 index 00000000..c30b1557 Binary files /dev/null and b/graphics/portraits/custom/Ike (Ranger)-HoxNorf-FE.bin differ diff --git a/graphics/portraits/custom/Ike (Ranger)-HoxNorf-FE.pal b/graphics/portraits/custom/Ike (Ranger)-HoxNorf-FE.pal new file mode 100644 index 00000000..9be07be4 --- /dev/null +++ b/graphics/portraits/custom/Ike (Ranger)-HoxNorf-FE.pal @@ -0,0 +1 @@ +|n%$1J=I1Zsf42^Wy)d F \ No newline at end of file diff --git a/graphics/portraits/custom/Kirby-Unknown-Kirby.bin b/graphics/portraits/custom/Kirby-Unknown-Kirby.bin new file mode 100644 index 00000000..294f1fae Binary files /dev/null and b/graphics/portraits/custom/Kirby-Unknown-Kirby.bin differ diff --git a/graphics/portraits/custom/Kirby-Unknown-Kirby.pal b/graphics/portraits/custom/Kirby-Unknown-Kirby.pal new file mode 100644 index 00000000..85fa74a7 Binary files /dev/null and b/graphics/portraits/custom/Kirby-Unknown-Kirby.pal differ diff --git a/graphics/portraits/custom/Lutz-HoxNorf-PS1.bin b/graphics/portraits/custom/Lutz-HoxNorf-PS1.bin new file mode 100644 index 00000000..58e04868 Binary files /dev/null and b/graphics/portraits/custom/Lutz-HoxNorf-PS1.bin differ diff --git a/graphics/portraits/custom/Lutz-HoxNorf-PS1.pal b/graphics/portraits/custom/Lutz-HoxNorf-PS1.pal new file mode 100644 index 00000000..e639ee7c --- /dev/null +++ b/graphics/portraits/custom/Lutz-HoxNorf-PS1.pal @@ -0,0 +1 @@ +|NnrJn{>n2r%MU/{ot \ No newline at end of file diff --git a/graphics/portraits/custom/Megumin-HoxNorf-Konosuba.bin b/graphics/portraits/custom/Megumin-HoxNorf-Konosuba.bin new file mode 100644 index 00000000..4d2e2a14 Binary files /dev/null and b/graphics/portraits/custom/Megumin-HoxNorf-Konosuba.bin differ diff --git a/graphics/portraits/custom/Megumin-HoxNorf-Konosuba.pal b/graphics/portraits/custom/Megumin-HoxNorf-Konosuba.pal new file mode 100644 index 00000000..2e0a7a88 --- /dev/null +++ b/graphics/portraits/custom/Megumin-HoxNorf-Konosuba.pal @@ -0,0 +1 @@ +| !.%~_P))=WcX>FN5* \ No newline at end of file diff --git a/graphics/portraits/custom/Meiling-HoxNorf-Touhou.bin b/graphics/portraits/custom/Meiling-HoxNorf-Touhou.bin new file mode 100644 index 00000000..acaaab24 Binary files /dev/null and b/graphics/portraits/custom/Meiling-HoxNorf-Touhou.bin differ diff --git a/graphics/portraits/custom/Meiling-HoxNorf-Touhou.pal b/graphics/portraits/custom/Meiling-HoxNorf-Touhou.pal new file mode 100644 index 00000000..08dacc82 --- /dev/null +++ b/graphics/portraits/custom/Meiling-HoxNorf-Touhou.pal @@ -0,0 +1,2 @@ +|]c-2X%1%o WFS[B +Z2 \ No newline at end of file diff --git a/graphics/portraits/custom/Miko-HoxNorf-Touhou.bin b/graphics/portraits/custom/Miko-HoxNorf-Touhou.bin new file mode 100644 index 00000000..81c6e7a4 Binary files /dev/null and b/graphics/portraits/custom/Miko-HoxNorf-Touhou.bin differ diff --git a/graphics/portraits/custom/Miko-HoxNorf-Touhou.pal b/graphics/portraits/custom/Miko-HoxNorf-Touhou.pal new file mode 100644 index 00000000..643e7122 Binary files /dev/null and b/graphics/portraits/custom/Miko-HoxNorf-Touhou.pal differ diff --git a/graphics/portraits/custom/Mokou-HoxNorf-Touhou.bin b/graphics/portraits/custom/Mokou-HoxNorf-Touhou.bin new file mode 100644 index 00000000..e22d6d8e Binary files /dev/null and b/graphics/portraits/custom/Mokou-HoxNorf-Touhou.bin differ diff --git a/graphics/portraits/custom/Mokou-HoxNorf-Touhou.pal b/graphics/portraits/custom/Mokou-HoxNorf-Touhou.pal new file mode 100644 index 00000000..01f9691f --- /dev/null +++ b/graphics/portraits/custom/Mokou-HoxNorf-Touhou.pal @@ -0,0 +1 @@ +|kV\_{VFo=cn1gRR;C( \ No newline at end of file diff --git a/graphics/portraits/custom/Olimar-HoxNorf-Pikmin.bin b/graphics/portraits/custom/Olimar-HoxNorf-Pikmin.bin new file mode 100644 index 00000000..57997fa0 Binary files /dev/null and b/graphics/portraits/custom/Olimar-HoxNorf-Pikmin.bin differ diff --git a/graphics/portraits/custom/Olimar-HoxNorf-Pikmin.pal b/graphics/portraits/custom/Olimar-HoxNorf-Pikmin.pal new file mode 100644 index 00000000..d3f0370b --- /dev/null +++ b/graphics/portraits/custom/Olimar-HoxNorf-Pikmin.pal @@ -0,0 +1 @@ +|))w?OZoWF:z>g=^>%! \ No newline at end of file diff --git a/graphics/portraits/custom/Purple Heart-HoxNorf-Neptunia.bin b/graphics/portraits/custom/Purple Heart-HoxNorf-Neptunia.bin new file mode 100644 index 00000000..372c2e04 Binary files /dev/null and b/graphics/portraits/custom/Purple Heart-HoxNorf-Neptunia.bin differ diff --git a/graphics/portraits/custom/Purple Heart-HoxNorf-Neptunia.pal b/graphics/portraits/custom/Purple Heart-HoxNorf-Neptunia.pal new file mode 100644 index 00000000..959d89b6 Binary files /dev/null and b/graphics/portraits/custom/Purple Heart-HoxNorf-Neptunia.pal differ diff --git a/graphics/portraits/custom/Reimu (PC98)-HoxNorf-Touhou.bin b/graphics/portraits/custom/Reimu (PC98)-HoxNorf-Touhou.bin new file mode 100644 index 00000000..fd80dd6e Binary files /dev/null and b/graphics/portraits/custom/Reimu (PC98)-HoxNorf-Touhou.bin differ diff --git a/graphics/portraits/custom/Reimu (PC98)-HoxNorf-Touhou.pal b/graphics/portraits/custom/Reimu (PC98)-HoxNorf-Touhou.pal new file mode 100644 index 00000000..ff119ee1 Binary files /dev/null and b/graphics/portraits/custom/Reimu (PC98)-HoxNorf-Touhou.pal differ diff --git a/graphics/portraits/custom/Shulk-HoxNorf-Xenoblade.bin b/graphics/portraits/custom/Shulk-HoxNorf-Xenoblade.bin new file mode 100644 index 00000000..66eb0da3 Binary files /dev/null and b/graphics/portraits/custom/Shulk-HoxNorf-Xenoblade.bin differ diff --git a/graphics/portraits/custom/Shulk-HoxNorf-Xenoblade.pal b/graphics/portraits/custom/Shulk-HoxNorf-Xenoblade.pal new file mode 100644 index 00000000..2e144da7 --- /dev/null +++ b/graphics/portraits/custom/Shulk-HoxNorf-Xenoblade.pal @@ -0,0 +1 @@ +|=K2e B,%x:%kW=fuV;- \ No newline at end of file diff --git a/graphics/portraits/custom/Tao-HoxNorf-Shining.bin b/graphics/portraits/custom/Tao-HoxNorf-Shining.bin new file mode 100644 index 00000000..b43de23d Binary files /dev/null and b/graphics/portraits/custom/Tao-HoxNorf-Shining.bin differ diff --git a/graphics/portraits/custom/Tao-HoxNorf-Shining.pal b/graphics/portraits/custom/Tao-HoxNorf-Shining.pal new file mode 100644 index 00000000..8d21ed54 Binary files /dev/null and b/graphics/portraits/custom/Tao-HoxNorf-Shining.pal differ diff --git a/graphics/portraits/custom/Tewi-HoxNorf-Touhou.bin b/graphics/portraits/custom/Tewi-HoxNorf-Touhou.bin new file mode 100644 index 00000000..8026cfde Binary files /dev/null and b/graphics/portraits/custom/Tewi-HoxNorf-Touhou.bin differ diff --git a/graphics/portraits/custom/Tewi-HoxNorf-Touhou.pal b/graphics/portraits/custom/Tewi-HoxNorf-Touhou.pal new file mode 100644 index 00000000..230977fc Binary files /dev/null and b/graphics/portraits/custom/Tewi-HoxNorf-Touhou.pal differ diff --git a/graphics/portraits/custom/Toadette (Sailor)-HoxNorf-Mario.bin b/graphics/portraits/custom/Toadette (Sailor)-HoxNorf-Mario.bin new file mode 100644 index 00000000..094577d6 Binary files /dev/null and b/graphics/portraits/custom/Toadette (Sailor)-HoxNorf-Mario.bin differ diff --git a/graphics/portraits/custom/Toadette (Sailor)-HoxNorf-Mario.pal b/graphics/portraits/custom/Toadette (Sailor)-HoxNorf-Mario.pal new file mode 100644 index 00000000..58acd5f5 Binary files /dev/null and b/graphics/portraits/custom/Toadette (Sailor)-HoxNorf-Mario.pal differ diff --git a/graphics/portraits/custom/Tycoon-metalliguy_Gens-FF5.bin b/graphics/portraits/custom/Tycoon-metalliguy_Gens-FF5.bin new file mode 100644 index 00000000..5b4b1c48 Binary files /dev/null and b/graphics/portraits/custom/Tycoon-metalliguy_Gens-FF5.bin differ diff --git a/graphics/portraits/custom/Tycoon-metalliguy_Gens-FF5.pal b/graphics/portraits/custom/Tycoon-metalliguy_Gens-FF5.pal new file mode 100644 index 00000000..021df6ea --- /dev/null +++ b/graphics/portraits/custom/Tycoon-metalliguy_Gens-FF5.pal @@ -0,0 +1 @@ +|Nv>iz'aT3{- !c+z { \ No newline at end of file diff --git a/graphics/portraits/custom/Wolf-JamesWhite89-Startfox.bin b/graphics/portraits/custom/Wolf-JamesWhite89-Startfox.bin deleted file mode 100644 index a85f2da2..00000000 Binary files a/graphics/portraits/custom/Wolf-JamesWhite89-Startfox.bin and /dev/null differ diff --git a/graphics/portraits/custom/Wolf-JamesWhite89-Startfox.pal b/graphics/portraits/custom/Wolf-JamesWhite89-Startfox.pal deleted file mode 100644 index 2dc113fb..00000000 Binary files a/graphics/portraits/custom/Wolf-JamesWhite89-Startfox.pal and /dev/null differ diff --git a/graphics/portraits/custom/Youmu-HoxNorf-Touhou.bin b/graphics/portraits/custom/Youmu-HoxNorf-Touhou.bin new file mode 100644 index 00000000..0006c007 Binary files /dev/null and b/graphics/portraits/custom/Youmu-HoxNorf-Touhou.bin differ diff --git a/graphics/portraits/custom/Youmu-HoxNorf-Touhou.pal b/graphics/portraits/custom/Youmu-HoxNorf-Touhou.pal new file mode 100644 index 00000000..766a9a89 --- /dev/null +++ b/graphics/portraits/custom/Youmu-HoxNorf-Touhou.pal @@ -0,0 +1 @@ +||ooZkgwbtV{(-J}cZN= \ No newline at end of file diff --git a/graphics/portraits/custom/Yukari-HoxNorf-Touhou.bin b/graphics/portraits/custom/Yukari-HoxNorf-Touhou.bin new file mode 100644 index 00000000..58a34449 Binary files /dev/null and b/graphics/portraits/custom/Yukari-HoxNorf-Touhou.bin differ diff --git a/graphics/portraits/custom/Yukari-HoxNorf-Touhou.pal b/graphics/portraits/custom/Yukari-HoxNorf-Touhou.pal new file mode 100644 index 00000000..d25dd1fd --- /dev/null +++ b/graphics/portraits/custom/Yukari-HoxNorf-Touhou.pal @@ -0,0 +1 @@ +|o01zBM=bJ3Z( 7>M9s5o]_ \ No newline at end of file diff --git a/graphics/portraits/portraits.py b/graphics/portraits/portraits.py index 52a746f2..d0888e43 100644 --- a/graphics/portraits/portraits.py +++ b/graphics/portraits/portraits.py @@ -311,6 +311,30 @@ 402 : "Lenna (Thief)-JamesWhite89-FF5", 403 : "Lenna (Summoner)-JamesWhite89-FF5", 404 : "Lenna (Beastmaster)-JamesWhite89-FF5", + 405 : "Purple Heart-HoxNorf-Neptunia", + 406 : "Reimu (PC98)-HoxNorf-Touhou", + 407 : "Mokou-HoxNorf-Touhou", + 408 : "Youmu-HoxNorf-Touhou", + 409 : "Kirby-Unknown-Kirby", + 410 : "Toadette (Sailor)-HoxNorf-Mario", + 411 : "Shulk-HoxNorf-Xenoblade", + 412 : "Miko-HoxNorf-Touhou", + 413 : "Flowey-pomariin-Undertale", + 414 : "Meiling-HoxNorf-Touhou", + 415 : "Olimar-HoxNorf-Pikmin", + 416 : "Tao-HoxNorf-Shining", + 417 : "Tycoon-metalliguy_Gens-FF5", + 418 : "Chaz-HoxNorf-PS4", + 419 : "Alys-HoxNorf-PS4", + 420 : "Fox-JamesWhite89-Starfox", + 421 : "Falco-JamesWhite89-Starfox", + 422 : "Lutz-HoxNorf-PS1", + 423 : "Yukari-HoxNorf-Touhou", + 424 : "Demi-HoxNorf-PS4", + 425 : "Ike (Ranger)-HoxNorf-FE", + 426 : "Tewi-HoxNorf-Touhou", + 427 : "Bow-HoxNorf-Mario", + 428 : "Megumin-HoxNorf-Konosuba", } def get_bin_path(id_): diff --git a/graphics/sprites/custom/Alys-HoxNorf-PS4.bin b/graphics/sprites/custom/Alys-HoxNorf-PS4.bin new file mode 100644 index 00000000..d00c5063 Binary files /dev/null and b/graphics/sprites/custom/Alys-HoxNorf-PS4.bin differ diff --git a/graphics/sprites/custom/Bartz (Dancer)-HoxNorf-FF5.bin b/graphics/sprites/custom/Bartz (Dancer)-HoxNorf-FF5.bin new file mode 100644 index 00000000..822de0c9 Binary files /dev/null and b/graphics/sprites/custom/Bartz (Dancer)-HoxNorf-FF5.bin differ diff --git a/graphics/sprites/custom/Bow-HoxNorf-Mario.bin b/graphics/sprites/custom/Bow-HoxNorf-Mario.bin new file mode 100644 index 00000000..b1b5db63 Binary files /dev/null and b/graphics/sprites/custom/Bow-HoxNorf-Mario.bin differ diff --git a/graphics/sprites/custom/Chaz-HoxNorf-PS4.bin b/graphics/sprites/custom/Chaz-HoxNorf-PS4.bin new file mode 100644 index 00000000..d49edf42 Binary files /dev/null and b/graphics/sprites/custom/Chaz-HoxNorf-PS4.bin differ diff --git a/graphics/sprites/custom/Demi-HoxNorf-PS4.bin b/graphics/sprites/custom/Demi-HoxNorf-PS4.bin new file mode 100644 index 00000000..7b6a9f4c Binary files /dev/null and b/graphics/sprites/custom/Demi-HoxNorf-PS4.bin differ diff --git a/graphics/sprites/custom/Falco-Badass-Starfox.bin b/graphics/sprites/custom/Falco-Badass-Starfox.bin new file mode 100644 index 00000000..ffc28b37 Binary files /dev/null and b/graphics/sprites/custom/Falco-Badass-Starfox.bin differ diff --git a/graphics/sprites/custom/Flowey-pomariin-Undertale.bin b/graphics/sprites/custom/Flowey-pomariin-Undertale.bin new file mode 100644 index 00000000..beb96c59 Binary files /dev/null and b/graphics/sprites/custom/Flowey-pomariin-Undertale.bin differ diff --git a/graphics/sprites/custom/Fox-CtrlxZ-Starfox.bin b/graphics/sprites/custom/Fox-CtrlxZ-Starfox.bin new file mode 100644 index 00000000..96d3ba9b Binary files /dev/null and b/graphics/sprites/custom/Fox-CtrlxZ-Starfox.bin differ diff --git a/graphics/sprites/custom/Hotaru-HoxNorf-MOTW.bin b/graphics/sprites/custom/Hotaru-HoxNorf-MOTW.bin index a44ac964..fb065025 100644 Binary files a/graphics/sprites/custom/Hotaru-HoxNorf-MOTW.bin and b/graphics/sprites/custom/Hotaru-HoxNorf-MOTW.bin differ diff --git a/graphics/sprites/custom/Iffy-HoxNorf-Neptunia.bin b/graphics/sprites/custom/Iffy-HoxNorf-Neptunia.bin index 5e9fe39c..4257eae6 100644 Binary files a/graphics/sprites/custom/Iffy-HoxNorf-Neptunia.bin and b/graphics/sprites/custom/Iffy-HoxNorf-Neptunia.bin differ diff --git a/graphics/sprites/custom/Ike (Ranger)-HoxNorf-FE.bin b/graphics/sprites/custom/Ike (Ranger)-HoxNorf-FE.bin new file mode 100644 index 00000000..8dca0781 Binary files /dev/null and b/graphics/sprites/custom/Ike (Ranger)-HoxNorf-FE.bin differ diff --git a/graphics/sprites/custom/Kirby-HoxNorf-Kirby.bin b/graphics/sprites/custom/Kirby-HoxNorf-Kirby.bin new file mode 100644 index 00000000..db0a7fb8 Binary files /dev/null and b/graphics/sprites/custom/Kirby-HoxNorf-Kirby.bin differ diff --git a/graphics/sprites/custom/Lutz-HoxNorf-PS1.bin b/graphics/sprites/custom/Lutz-HoxNorf-PS1.bin new file mode 100644 index 00000000..9f08f45e Binary files /dev/null and b/graphics/sprites/custom/Lutz-HoxNorf-PS1.bin differ diff --git a/graphics/sprites/custom/Marisa2-HoxNorf-Touhou.bin b/graphics/sprites/custom/Marisa2-HoxNorf-Touhou.bin new file mode 100644 index 00000000..0d4646f2 Binary files /dev/null and b/graphics/sprites/custom/Marisa2-HoxNorf-Touhou.bin differ diff --git a/graphics/sprites/custom/Megumin-HoxNorf-Konosuba.bin b/graphics/sprites/custom/Megumin-HoxNorf-Konosuba.bin new file mode 100644 index 00000000..fbe7021a Binary files /dev/null and b/graphics/sprites/custom/Megumin-HoxNorf-Konosuba.bin differ diff --git a/graphics/sprites/custom/Meiling-HoxNorf-Touhou.bin b/graphics/sprites/custom/Meiling-HoxNorf-Touhou.bin new file mode 100644 index 00000000..ca0468a9 Binary files /dev/null and b/graphics/sprites/custom/Meiling-HoxNorf-Touhou.bin differ diff --git a/graphics/sprites/custom/Miko-HoxNorf-Touhou.bin b/graphics/sprites/custom/Miko-HoxNorf-Touhou.bin new file mode 100644 index 00000000..577ea7fb Binary files /dev/null and b/graphics/sprites/custom/Miko-HoxNorf-Touhou.bin differ diff --git a/graphics/sprites/custom/Mokou-HoxNorf-Touhou.bin b/graphics/sprites/custom/Mokou-HoxNorf-Touhou.bin new file mode 100644 index 00000000..a483441c Binary files /dev/null and b/graphics/sprites/custom/Mokou-HoxNorf-Touhou.bin differ diff --git a/graphics/sprites/custom/Olimar-HoxNorf-Pikmin.bin b/graphics/sprites/custom/Olimar-HoxNorf-Pikmin.bin new file mode 100644 index 00000000..e2fb5bfa Binary files /dev/null and b/graphics/sprites/custom/Olimar-HoxNorf-Pikmin.bin differ diff --git a/graphics/sprites/custom/Peach-Halkel-SMRPG.bin b/graphics/sprites/custom/Peach-Halkel-SMRPG.bin index b9348415..9b0a253d 100644 Binary files a/graphics/sprites/custom/Peach-Halkel-SMRPG.bin and b/graphics/sprites/custom/Peach-Halkel-SMRPG.bin differ diff --git a/graphics/sprites/custom/Purple Heart-HoxNorf-Neptunia.bin b/graphics/sprites/custom/Purple Heart-HoxNorf-Neptunia.bin new file mode 100644 index 00000000..04917522 Binary files /dev/null and b/graphics/sprites/custom/Purple Heart-HoxNorf-Neptunia.bin differ diff --git a/graphics/sprites/custom/Reimu (PC98)-HoxNorf-Touhou.bin b/graphics/sprites/custom/Reimu (PC98)-HoxNorf-Touhou.bin new file mode 100644 index 00000000..1869c1f1 Binary files /dev/null and b/graphics/sprites/custom/Reimu (PC98)-HoxNorf-Touhou.bin differ diff --git a/graphics/sprites/custom/Shulk-HoxNorf-Xenoblade.bin b/graphics/sprites/custom/Shulk-HoxNorf-Xenoblade.bin new file mode 100644 index 00000000..7c6a42b1 Binary files /dev/null and b/graphics/sprites/custom/Shulk-HoxNorf-Xenoblade.bin differ diff --git a/graphics/sprites/custom/Tao-HoxNorf-Shining.bin b/graphics/sprites/custom/Tao-HoxNorf-Shining.bin new file mode 100644 index 00000000..d8108490 Binary files /dev/null and b/graphics/sprites/custom/Tao-HoxNorf-Shining.bin differ diff --git a/graphics/sprites/custom/Tewi-HoxNorf-Touhou.bin b/graphics/sprites/custom/Tewi-HoxNorf-Touhou.bin new file mode 100644 index 00000000..bdbd2542 Binary files /dev/null and b/graphics/sprites/custom/Tewi-HoxNorf-Touhou.bin differ diff --git a/graphics/sprites/custom/Toadette (Explorer)-HoxNorf-Mario.bin b/graphics/sprites/custom/Toadette (Explorer)-HoxNorf-Mario.bin index 9ba75e22..63f4c8a5 100644 Binary files a/graphics/sprites/custom/Toadette (Explorer)-HoxNorf-Mario.bin and b/graphics/sprites/custom/Toadette (Explorer)-HoxNorf-Mario.bin differ diff --git a/graphics/sprites/custom/Toadette (Sailor)-HoxNorf-Mario.bin b/graphics/sprites/custom/Toadette (Sailor)-HoxNorf-Mario.bin new file mode 100644 index 00000000..79556a67 Binary files /dev/null and b/graphics/sprites/custom/Toadette (Sailor)-HoxNorf-Mario.bin differ diff --git a/graphics/sprites/custom/Toadette-HoxNorf-Mario.bin b/graphics/sprites/custom/Toadette-HoxNorf-Mario.bin index 9f96112f..4b402f71 100644 Binary files a/graphics/sprites/custom/Toadette-HoxNorf-Mario.bin and b/graphics/sprites/custom/Toadette-HoxNorf-Mario.bin differ diff --git a/graphics/sprites/custom/Tycoon-HoxNorf-FF5.bin b/graphics/sprites/custom/Tycoon-HoxNorf-FF5.bin new file mode 100644 index 00000000..b9ed1e51 Binary files /dev/null and b/graphics/sprites/custom/Tycoon-HoxNorf-FF5.bin differ diff --git a/graphics/sprites/custom/Youmu-HoxNorf-Touhou.bin b/graphics/sprites/custom/Youmu-HoxNorf-Touhou.bin new file mode 100644 index 00000000..b33c5b94 Binary files /dev/null and b/graphics/sprites/custom/Youmu-HoxNorf-Touhou.bin differ diff --git a/graphics/sprites/custom/Yukari-HoxNorf-Touhou.bin b/graphics/sprites/custom/Yukari-HoxNorf-Touhou.bin new file mode 100644 index 00000000..60276d6e Binary files /dev/null and b/graphics/sprites/custom/Yukari-HoxNorf-Touhou.bin differ diff --git a/graphics/sprites/sprites.py b/graphics/sprites/sprites.py index 8e71c060..d315f0d8 100644 --- a/graphics/sprites/sprites.py +++ b/graphics/sprites/sprites.py @@ -310,6 +310,32 @@ 355 : "Lenna (Thief)-HoxNorf-FF5", 356 : "Lenna (Summoner)-HoxNorf-FF5", 357 : "Lenna (Beastmaster)-HoxNorf-FF5", + 358 : "Purple Heart-HoxNorf-Neptunia", + 359 : "Reimu (PC98)-HoxNorf-Touhou", + 360 : "Mokou-HoxNorf-Touhou", + 361 : "Youmu-HoxNorf-Touhou", + 362 : "Kirby-HoxNorf-Kirby", + 363 : "Toadette (Sailor)-HoxNorf-Mario", + 364 : "Shulk-HoxNorf-Xenoblade", + 365 : "Miko-HoxNorf-Touhou", + 366 : "Flowey-pomariin-Undertale", + 367 : "Meiling-HoxNorf-Touhou", + 368 : "Olimar-HoxNorf-Pikmin", + 369 : "Tao-HoxNorf-Shining", + 370 : "Tycoon-HoxNorf-FF5", + 371 : "Chaz-HoxNorf-PS4", + 372 : "Alys-HoxNorf-PS4", + 373 : "Fox-CtrlxZ-Starfox", + 374 : "Falco-Badass-Starfox", + 375 : "Lutz-HoxNorf-PS1", + 376 : "Yukari-HoxNorf-Touhou", + 377 : "Demi-HoxNorf-PS4", + 378 : "Ike (Ranger)-HoxNorf-FE", + 379 : "Bartz (Dancer)-HoxNorf-FF5", + 380 : "Marisa2-HoxNorf-Touhou", + 381 : "Tewi-HoxNorf-Touhou", + 382 : "Bow-HoxNorf-Mario", + 383 : "Megumin-HoxNorf-Konosuba", } def get_path(id_): diff --git a/version.py b/version.py index daa50c7c..e6670481 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -__version__ = "1.4.2" +__version__ = "1.4.3d"