From b0f4573e38c026a506a4bd81eec66715d15f8d11 Mon Sep 17 00:00:00 2001 From: ImperialSympathizer Date: Thu, 19 Sep 2024 22:31:47 -0400 Subject: [PATCH] update naming convention of sprites --- .../{berry_bush.json => berries_abound_bush.json} | 2 +- .../{berry_bush.png => berries_abound_bush.png} | Bin ...ad_scientist_m.json => dark_deal_scientist.json} | 2 +- ...{mad_scientist_m.png => dark_deal_scientist.png} | Bin ...w2_lady.json => department_store_sale_lady.json} | 2 +- ...b2w2_lady.png => department_store_sale_lady.png} | Bin .../{exclaim.png => encounter_exclaim.png} | Bin .../{teacher.json => field_trip_teacher.json} | 2 +- .../{teacher.png => field_trip_teacher.png} | Bin .../{carnival_game.json => fun_and_games_game.json} | 2 +- .../{carnival_game.png => fun_and_games_game.png} | Bin .../{carnival_man.json => fun_and_games_man.json} | 2 +- .../{carnival_man.png => fun_and_games_man.png} | Bin ..._wobbuffet.json => fun_and_games_wobbuffet.json} | 2 +- ...al_wobbuffet.png => fun_and_games_wobbuffet.png} | Bin .../{buoy.json => lost_at_sea_buoy.json} | 0 .../{buoy.png => lost_at_sea_buoy.png} | Bin .../{chest_blue.json => mysterious_chest_blue.json} | 2 +- .../{chest_blue.png => mysterious_chest_blue.png} | Bin .../{chest_red.json => mysterious_chest_red.json} | 2 +- .../{chest_red.png => mysterious_chest_red.png} | Bin .../{warehouse_crate.json => part_timer_crate.json} | 2 +- .../{warehouse_crate.png => part_timer_crate.png} | Bin .../{bait.json => safari_zone_bait.json} | 2 +- .../{bait.png => safari_zone_bait.png} | Bin .../{mud.json => safari_zone_mud.json} | 2 +- .../{mud.png => safari_zone_mud.png} | Bin ...2w2_veteran_m.json => shady_vitamin_dealer.json} | 2 +- ...{b2w2_veteran_m.png => shady_vitamin_dealer.png} | Bin ...ter.json => teleporting_hijinks_teleporter.json} | 2 +- ...orter.png => teleporting_hijinks_teleporter.png} | Bin ...raining_gear.json => training_session_gear.json} | 2 +- ...{training_gear.png => training_session_gear.png} | Bin .../encounters/berries-abound-encounter.ts | 2 +- .../encounters/dark-deal-encounter.ts | 2 +- .../encounters/delibirdy-encounter.ts | 4 ++-- .../encounters/department-store-sale-encounter.ts | 2 +- .../encounters/field-trip-encounter.ts | 2 +- .../encounters/fun-and-games-encounter.ts | 6 +++--- .../encounters/lost-at-sea-encounter.ts | 2 +- .../encounters/mysterious-chest-encounter.ts | 4 ++-- .../encounters/part-timer-encounter.ts | 2 +- .../encounters/safari-zone-encounter.ts | 8 ++++---- .../encounters/shady-vitamin-dealer-encounter.ts | 2 +- .../encounters/teleporting-hijinks-encounter.ts | 2 +- .../encounters/training-session-encounter.ts | 2 +- .../utils/encounter-phase-utils.ts | 2 +- src/phases/encounter-phase.ts | 2 +- 48 files changed, 37 insertions(+), 37 deletions(-) rename public/images/mystery-encounters/{berry_bush.json => berries_abound_bush.json} (94%) rename public/images/mystery-encounters/{berry_bush.png => berries_abound_bush.png} (100%) rename public/images/mystery-encounters/{mad_scientist_m.json => dark_deal_scientist.json} (94%) rename public/images/mystery-encounters/{mad_scientist_m.png => dark_deal_scientist.png} (100%) rename public/images/mystery-encounters/{b2w2_lady.json => department_store_sale_lady.json} (99%) rename public/images/mystery-encounters/{b2w2_lady.png => department_store_sale_lady.png} (100%) rename public/images/mystery-encounters/{exclaim.png => encounter_exclaim.png} (100%) rename public/images/mystery-encounters/{teacher.json => field_trip_teacher.json} (94%) rename public/images/mystery-encounters/{teacher.png => field_trip_teacher.png} (100%) rename public/images/mystery-encounters/{carnival_game.json => fun_and_games_game.json} (94%) rename public/images/mystery-encounters/{carnival_game.png => fun_and_games_game.png} (100%) rename public/images/mystery-encounters/{carnival_man.json => fun_and_games_man.json} (94%) rename public/images/mystery-encounters/{carnival_man.png => fun_and_games_man.png} (100%) rename public/images/mystery-encounters/{carnival_wobbuffet.json => fun_and_games_wobbuffet.json} (94%) rename public/images/mystery-encounters/{carnival_wobbuffet.png => fun_and_games_wobbuffet.png} (100%) rename public/images/mystery-encounters/{buoy.json => lost_at_sea_buoy.json} (100%) rename public/images/mystery-encounters/{buoy.png => lost_at_sea_buoy.png} (100%) rename public/images/mystery-encounters/{chest_blue.json => mysterious_chest_blue.json} (98%) rename public/images/mystery-encounters/{chest_blue.png => mysterious_chest_blue.png} (100%) rename public/images/mystery-encounters/{chest_red.json => mysterious_chest_red.json} (98%) rename public/images/mystery-encounters/{chest_red.png => mysterious_chest_red.png} (100%) rename public/images/mystery-encounters/{warehouse_crate.json => part_timer_crate.json} (95%) rename public/images/mystery-encounters/{warehouse_crate.png => part_timer_crate.png} (100%) rename public/images/mystery-encounters/{bait.json => safari_zone_bait.json} (97%) rename public/images/mystery-encounters/{bait.png => safari_zone_bait.png} (100%) rename public/images/mystery-encounters/{mud.json => safari_zone_mud.json} (97%) rename public/images/mystery-encounters/{mud.png => safari_zone_mud.png} (100%) rename public/images/mystery-encounters/{b2w2_veteran_m.json => shady_vitamin_dealer.json} (99%) rename public/images/mystery-encounters/{b2w2_veteran_m.png => shady_vitamin_dealer.png} (100%) rename public/images/mystery-encounters/{teleporter.json => teleporting_hijinks_teleporter.json} (93%) rename public/images/mystery-encounters/{teleporter.png => teleporting_hijinks_teleporter.png} (100%) rename public/images/mystery-encounters/{training_gear.json => training_session_gear.json} (94%) rename public/images/mystery-encounters/{training_gear.png => training_session_gear.png} (100%) diff --git a/public/images/mystery-encounters/berry_bush.json b/public/images/mystery-encounters/berries_abound_bush.json similarity index 94% rename from public/images/mystery-encounters/berry_bush.json rename to public/images/mystery-encounters/berries_abound_bush.json index 397538d8af2..749031d7da8 100644 --- a/public/images/mystery-encounters/berry_bush.json +++ b/public/images/mystery-encounters/berries_abound_bush.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "berry_bush.png", + "image": "berries_abound_bush.png", "format": "RGBA8888", "size": { "w": 49, diff --git a/public/images/mystery-encounters/berry_bush.png b/public/images/mystery-encounters/berries_abound_bush.png similarity index 100% rename from public/images/mystery-encounters/berry_bush.png rename to public/images/mystery-encounters/berries_abound_bush.png diff --git a/public/images/mystery-encounters/mad_scientist_m.json b/public/images/mystery-encounters/dark_deal_scientist.json similarity index 94% rename from public/images/mystery-encounters/mad_scientist_m.json rename to public/images/mystery-encounters/dark_deal_scientist.json index 10aa3d6f42a..95db5d1b71a 100644 --- a/public/images/mystery-encounters/mad_scientist_m.json +++ b/public/images/mystery-encounters/dark_deal_scientist.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "mad_scientist_m.png", + "image": "dark_deal_scientist.png", "format": "RGBA8888", "size": { "w": 46, diff --git a/public/images/mystery-encounters/mad_scientist_m.png b/public/images/mystery-encounters/dark_deal_scientist.png similarity index 100% rename from public/images/mystery-encounters/mad_scientist_m.png rename to public/images/mystery-encounters/dark_deal_scientist.png diff --git a/public/images/mystery-encounters/b2w2_lady.json b/public/images/mystery-encounters/department_store_sale_lady.json similarity index 99% rename from public/images/mystery-encounters/b2w2_lady.json rename to public/images/mystery-encounters/department_store_sale_lady.json index e143086e157..5ba5b2019ff 100644 --- a/public/images/mystery-encounters/b2w2_lady.json +++ b/public/images/mystery-encounters/department_store_sale_lady.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "b2w2_lady.png", + "image": "department_store_sale_lady.png", "format": "RGBA8888", "size": { "w": 399, diff --git a/public/images/mystery-encounters/b2w2_lady.png b/public/images/mystery-encounters/department_store_sale_lady.png similarity index 100% rename from public/images/mystery-encounters/b2w2_lady.png rename to public/images/mystery-encounters/department_store_sale_lady.png diff --git a/public/images/mystery-encounters/exclaim.png b/public/images/mystery-encounters/encounter_exclaim.png similarity index 100% rename from public/images/mystery-encounters/exclaim.png rename to public/images/mystery-encounters/encounter_exclaim.png diff --git a/public/images/mystery-encounters/teacher.json b/public/images/mystery-encounters/field_trip_teacher.json similarity index 94% rename from public/images/mystery-encounters/teacher.json rename to public/images/mystery-encounters/field_trip_teacher.json index 457d440a010..52a304b3421 100644 --- a/public/images/mystery-encounters/teacher.json +++ b/public/images/mystery-encounters/field_trip_teacher.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "teacher.png", + "image": "field_trip_teacher.png", "format": "RGBA8888", "size": { "w": 43, diff --git a/public/images/mystery-encounters/teacher.png b/public/images/mystery-encounters/field_trip_teacher.png similarity index 100% rename from public/images/mystery-encounters/teacher.png rename to public/images/mystery-encounters/field_trip_teacher.png diff --git a/public/images/mystery-encounters/carnival_game.json b/public/images/mystery-encounters/fun_and_games_game.json similarity index 94% rename from public/images/mystery-encounters/carnival_game.json rename to public/images/mystery-encounters/fun_and_games_game.json index 0572b95990c..71fb30fda33 100644 --- a/public/images/mystery-encounters/carnival_game.json +++ b/public/images/mystery-encounters/fun_and_games_game.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "carnival_game.png", + "image": "fun_and_games_game.png", "format": "RGBA8888", "size": { "w": 38, diff --git a/public/images/mystery-encounters/carnival_game.png b/public/images/mystery-encounters/fun_and_games_game.png similarity index 100% rename from public/images/mystery-encounters/carnival_game.png rename to public/images/mystery-encounters/fun_and_games_game.png diff --git a/public/images/mystery-encounters/carnival_man.json b/public/images/mystery-encounters/fun_and_games_man.json similarity index 94% rename from public/images/mystery-encounters/carnival_man.json rename to public/images/mystery-encounters/fun_and_games_man.json index 3e77765bbce..9536e108055 100644 --- a/public/images/mystery-encounters/carnival_man.json +++ b/public/images/mystery-encounters/fun_and_games_man.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "carnival_man.png", + "image": "fun_and_games_man.png", "format": "RGBA8888", "size": { "w": 50, diff --git a/public/images/mystery-encounters/carnival_man.png b/public/images/mystery-encounters/fun_and_games_man.png similarity index 100% rename from public/images/mystery-encounters/carnival_man.png rename to public/images/mystery-encounters/fun_and_games_man.png diff --git a/public/images/mystery-encounters/carnival_wobbuffet.json b/public/images/mystery-encounters/fun_and_games_wobbuffet.json similarity index 94% rename from public/images/mystery-encounters/carnival_wobbuffet.json rename to public/images/mystery-encounters/fun_and_games_wobbuffet.json index c059bb35a96..2f218cd208b 100644 --- a/public/images/mystery-encounters/carnival_wobbuffet.json +++ b/public/images/mystery-encounters/fun_and_games_wobbuffet.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "carnival_wobbuffet.png", + "image": "fun_and_games_wobbuffet.png", "format": "RGBA8888", "size": { "w": 45, diff --git a/public/images/mystery-encounters/carnival_wobbuffet.png b/public/images/mystery-encounters/fun_and_games_wobbuffet.png similarity index 100% rename from public/images/mystery-encounters/carnival_wobbuffet.png rename to public/images/mystery-encounters/fun_and_games_wobbuffet.png diff --git a/public/images/mystery-encounters/buoy.json b/public/images/mystery-encounters/lost_at_sea_buoy.json similarity index 100% rename from public/images/mystery-encounters/buoy.json rename to public/images/mystery-encounters/lost_at_sea_buoy.json diff --git a/public/images/mystery-encounters/buoy.png b/public/images/mystery-encounters/lost_at_sea_buoy.png similarity index 100% rename from public/images/mystery-encounters/buoy.png rename to public/images/mystery-encounters/lost_at_sea_buoy.png diff --git a/public/images/mystery-encounters/chest_blue.json b/public/images/mystery-encounters/mysterious_chest_blue.json similarity index 98% rename from public/images/mystery-encounters/chest_blue.json rename to public/images/mystery-encounters/mysterious_chest_blue.json index 916afc3242c..c55294a7bdc 100644 --- a/public/images/mystery-encounters/chest_blue.json +++ b/public/images/mystery-encounters/mysterious_chest_blue.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "chest_blue.png", + "image": "mysterious_chest_blue.png", "format": "RGBA8888", "size": { "w": 54, diff --git a/public/images/mystery-encounters/chest_blue.png b/public/images/mystery-encounters/mysterious_chest_blue.png similarity index 100% rename from public/images/mystery-encounters/chest_blue.png rename to public/images/mystery-encounters/mysterious_chest_blue.png diff --git a/public/images/mystery-encounters/chest_red.json b/public/images/mystery-encounters/mysterious_chest_red.json similarity index 98% rename from public/images/mystery-encounters/chest_red.json rename to public/images/mystery-encounters/mysterious_chest_red.json index 579cf7bda06..fe560ecf43c 100644 --- a/public/images/mystery-encounters/chest_red.json +++ b/public/images/mystery-encounters/mysterious_chest_red.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "chest_red.png", + "image": "mysterious_chest_red.png", "format": "RGBA8888", "size": { "w": 54, diff --git a/public/images/mystery-encounters/chest_red.png b/public/images/mystery-encounters/mysterious_chest_red.png similarity index 100% rename from public/images/mystery-encounters/chest_red.png rename to public/images/mystery-encounters/mysterious_chest_red.png diff --git a/public/images/mystery-encounters/warehouse_crate.json b/public/images/mystery-encounters/part_timer_crate.json similarity index 95% rename from public/images/mystery-encounters/warehouse_crate.json rename to public/images/mystery-encounters/part_timer_crate.json index fa86d1a511d..0bc67774770 100644 --- a/public/images/mystery-encounters/warehouse_crate.json +++ b/public/images/mystery-encounters/part_timer_crate.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "warehouse_crate.png", + "image": "part_timer_crate.png", "format": "RGBA8888", "size": { "w": 71, diff --git a/public/images/mystery-encounters/warehouse_crate.png b/public/images/mystery-encounters/part_timer_crate.png similarity index 100% rename from public/images/mystery-encounters/warehouse_crate.png rename to public/images/mystery-encounters/part_timer_crate.png diff --git a/public/images/mystery-encounters/bait.json b/public/images/mystery-encounters/safari_zone_bait.json similarity index 97% rename from public/images/mystery-encounters/bait.json rename to public/images/mystery-encounters/safari_zone_bait.json index ae9ee38ee13..4786dd34840 100644 --- a/public/images/mystery-encounters/bait.json +++ b/public/images/mystery-encounters/safari_zone_bait.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "bait.png", + "image": "safari_zone_bait.png", "format": "RGBA8888", "size": { "w": 14, diff --git a/public/images/mystery-encounters/bait.png b/public/images/mystery-encounters/safari_zone_bait.png similarity index 100% rename from public/images/mystery-encounters/bait.png rename to public/images/mystery-encounters/safari_zone_bait.png diff --git a/public/images/mystery-encounters/mud.json b/public/images/mystery-encounters/safari_zone_mud.json similarity index 97% rename from public/images/mystery-encounters/mud.json rename to public/images/mystery-encounters/safari_zone_mud.json index 505a6fadd27..8f58857351e 100644 --- a/public/images/mystery-encounters/mud.json +++ b/public/images/mystery-encounters/safari_zone_mud.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "mud.png", + "image": "safari_zone_mud.png", "format": "RGBA8888", "size": { "w": 14, diff --git a/public/images/mystery-encounters/mud.png b/public/images/mystery-encounters/safari_zone_mud.png similarity index 100% rename from public/images/mystery-encounters/mud.png rename to public/images/mystery-encounters/safari_zone_mud.png diff --git a/public/images/mystery-encounters/b2w2_veteran_m.json b/public/images/mystery-encounters/shady_vitamin_dealer.json similarity index 99% rename from public/images/mystery-encounters/b2w2_veteran_m.json rename to public/images/mystery-encounters/shady_vitamin_dealer.json index 8f07c7d44e2..43c707d05ca 100644 --- a/public/images/mystery-encounters/b2w2_veteran_m.json +++ b/public/images/mystery-encounters/shady_vitamin_dealer.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "b2w2_veteran_m.png", + "image": "shady_vitamin_dealer.png", "format": "RGBA8888", "size": { "w": 424, diff --git a/public/images/mystery-encounters/b2w2_veteran_m.png b/public/images/mystery-encounters/shady_vitamin_dealer.png similarity index 100% rename from public/images/mystery-encounters/b2w2_veteran_m.png rename to public/images/mystery-encounters/shady_vitamin_dealer.png diff --git a/public/images/mystery-encounters/teleporter.json b/public/images/mystery-encounters/teleporting_hijinks_teleporter.json similarity index 93% rename from public/images/mystery-encounters/teleporter.json rename to public/images/mystery-encounters/teleporting_hijinks_teleporter.json index 4fe45807be2..04a3acd4369 100644 --- a/public/images/mystery-encounters/teleporter.json +++ b/public/images/mystery-encounters/teleporting_hijinks_teleporter.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "teleporter.png", + "image": "teleporting_hijinks_teleporter.png", "format": "RGBA8888", "size": { "w": 74, diff --git a/public/images/mystery-encounters/teleporter.png b/public/images/mystery-encounters/teleporting_hijinks_teleporter.png similarity index 100% rename from public/images/mystery-encounters/teleporter.png rename to public/images/mystery-encounters/teleporting_hijinks_teleporter.png diff --git a/public/images/mystery-encounters/training_gear.json b/public/images/mystery-encounters/training_session_gear.json similarity index 94% rename from public/images/mystery-encounters/training_gear.json rename to public/images/mystery-encounters/training_session_gear.json index fb8f4ec9c8e..8196c03f305 100644 --- a/public/images/mystery-encounters/training_gear.json +++ b/public/images/mystery-encounters/training_session_gear.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "training_gear.png", + "image": "training_session_gear.png", "format": "RGBA8888", "size": { "w": 76, diff --git a/public/images/mystery-encounters/training_gear.png b/public/images/mystery-encounters/training_session_gear.png similarity index 100% rename from public/images/mystery-encounters/training_gear.png rename to public/images/mystery-encounters/training_session_gear.png diff --git a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts index d1497c54527..ef5f57c7959 100644 --- a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts +++ b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts @@ -82,7 +82,7 @@ export const BerriesAboundEncounter: MysteryEncounter = const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon); encounter.spriteConfigs = [ { - spriteKey: "berry_bush", + spriteKey: "berries_abound_bush", fileRoot: "mystery-encounters", x: 25, y: -6, diff --git a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts index 09b058ab7c9..2869e6fe9ac 100644 --- a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts +++ b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts @@ -94,7 +94,7 @@ export const DarkDealEncounter: MysteryEncounter = .withEncounterTier(MysteryEncounterTier.ROGUE) .withIntroSpriteConfigs([ { - spriteKey: "mad_scientist_m", + spriteKey: "dark_deal_scientist", fileRoot: "mystery-encounters", hasShadow: true, }, diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts index 25959abe19e..1e50e1dd869 100644 --- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts +++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts @@ -10,7 +10,7 @@ import { CombinationPokemonRequirement, HeldItemRequirement, MoneyRequirement } import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { HealingBoosterModifier, HiddenAbilityRateBoosterModifier, LevelIncrementBoosterModifier, PokemonHeldItemModifier, PreserveBerryModifier } from "#app/modifier/modifier"; +import { BerryModifier, HealingBoosterModifier, HiddenAbilityRateBoosterModifier, LevelIncrementBoosterModifier, PokemonHeldItemModifier, PreserveBerryModifier } from "#app/modifier/modifier"; import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import { applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import i18next from "#app/plugins/i18n"; @@ -197,7 +197,7 @@ export const DelibirdyEncounter: MysteryEncounter = const modifier = encounter.misc.chosenModifier; // Give the player a Candy Jar if they gave a Berry, and a Healing Charm for Reviver Seed - if (modifier.type.name.includes("Berry")) { + if (modifier instanceof BerryModifier) { // Check if the player has max stacks of that Candy Jar already const existing = scene.findModifier(m => m instanceof LevelIncrementBoosterModifier) as LevelIncrementBoosterModifier; diff --git a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts index 104b46bce8a..db25d338a29 100644 --- a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts +++ b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts @@ -27,7 +27,7 @@ export const DepartmentStoreSaleEncounter: MysteryEncounter = .withSceneWaveRangeRequirement(CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES[0], 100) .withIntroSpriteConfigs([ { - spriteKey: "b2w2_lady", + spriteKey: "department_store_sale_lady", fileRoot: "mystery-encounters", hasShadow: true, x: -20, diff --git a/src/data/mystery-encounters/encounters/field-trip-encounter.ts b/src/data/mystery-encounters/encounters/field-trip-encounter.ts index d03a3c1fcca..82f27c5e59b 100644 --- a/src/data/mystery-encounters/encounters/field-trip-encounter.ts +++ b/src/data/mystery-encounters/encounters/field-trip-encounter.ts @@ -32,7 +32,7 @@ export const FieldTripEncounter: MysteryEncounter = hasShadow: true, }, { - spriteKey: "teacher", + spriteKey: "field_trip_teacher", fileRoot: "mystery-encounters", hasShadow: true, }, diff --git a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts index 9ca7c7c2865..6c4aac0016a 100644 --- a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts +++ b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts @@ -45,14 +45,14 @@ export const FunAndGamesEncounter: MysteryEncounter = .withSkipToFightInput(true) .withIntroSpriteConfigs([ { - spriteKey: "carnival_game", + spriteKey: "fun_and_games_game", fileRoot: "mystery-encounters", hasShadow: false, x: 0, y: 6, }, { - spriteKey: "carnival_wobbuffet", + spriteKey: "fun_and_games_wobbuffet", fileRoot: "mystery-encounters", hasShadow: true, x: -28, @@ -60,7 +60,7 @@ export const FunAndGamesEncounter: MysteryEncounter = yShadow: 6 }, { - spriteKey: "carnival_man", + spriteKey: "fun_and_games_man", fileRoot: "mystery-encounters", hasShadow: true, x: 40, diff --git a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts index 509ffb11b26..02426c2cab6 100644 --- a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts +++ b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts @@ -33,7 +33,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) .withIntroSpriteConfigs([ { - spriteKey: "buoy", + spriteKey: "lost_at_sea_buoy", fileRoot: "mystery-encounters", hasShadow: false, x: 20, diff --git a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts index 18b2db53ba2..2d2540bd91c 100644 --- a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts +++ b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts @@ -37,7 +37,7 @@ export const MysteriousChestEncounter: MysteryEncounter = .withCatchAllowed(true) .withIntroSpriteConfigs([ { - spriteKey: "chest_blue", + spriteKey: "mysterious_chest_blue", fileRoot: "mystery-encounters", hasShadow: true, y: 8, @@ -46,7 +46,7 @@ export const MysteriousChestEncounter: MysteryEncounter = disableAnimation: true, // Re-enabled after option select }, { - spriteKey: "chest_red", + spriteKey: "mysterious_chest_red", fileRoot: "mystery-encounters", hasShadow: false, y: 8, diff --git a/src/data/mystery-encounters/encounters/part-timer-encounter.ts b/src/data/mystery-encounters/encounters/part-timer-encounter.ts index f5486d34ea9..ad072c48171 100644 --- a/src/data/mystery-encounters/encounters/part-timer-encounter.ts +++ b/src/data/mystery-encounters/encounters/part-timer-encounter.ts @@ -27,7 +27,7 @@ export const PartTimerEncounter: MysteryEncounter = .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES) .withIntroSpriteConfigs([ { - spriteKey: "warehouse_crate", + spriteKey: "part_timer_crate", fileRoot: "mystery-encounters", hasShadow: false, y: 6, diff --git a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts index 2690460757f..b9b50690ea1 100644 --- a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts +++ b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts @@ -79,8 +79,8 @@ export const SafariZoneEncounter: MysteryEncounter = scene.loadSe("PRSFX- Bug Bite", "battle_anims", "PRSFX- Bug Bite.wav"); scene.loadSe("PRSFX- Sludge Bomb2", "battle_anims", "PRSFX- Sludge Bomb2.wav"); scene.loadSe("PRSFX- Taunt2", "battle_anims", "PRSFX- Taunt2.wav"); - scene.loadAtlas("bait", "mystery-encounters"); - scene.loadAtlas("mud", "mystery-encounters"); + scene.loadAtlas("safari_zone_bait", "mystery-encounters"); + scene.loadAtlas("safari_zone_mud", "mystery-encounters"); // Clear enemy party scene.currentBattle.enemyParty = []; await transitionMysteryEncounterIntroVisuals(scene); @@ -322,7 +322,7 @@ async function throwBait(scene: BattleScene, pokemon: EnemyPokemon): Promise(resolve => { this.scene.loadSe("GEN8- Exclaim", "battle_anims", "GEN8- Exclaim.wav"); - this.scene.loadImage("exclaim", "mystery-encounters"); + this.scene.loadImage("encounter_exclaim", "mystery-encounters"); this.scene.load.once(Phaser.Loader.Events.COMPLETE, () => resolve()); if (!this.scene.load.isLoading()) { this.scene.load.start();