Skip to content

Commit be7785c

Browse files
committed
:3
1 parent e7dc53f commit be7785c

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

worlds/pokemon_crystal_prerelease/data.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ class MiscOption(IntEnum):
258258
DontFuckleWithShuckle = auto()
259259
Fuschia = auto()
260260
NewItem = auto()
261+
BlueBlue = auto()
261262

262263

263264
@dataclass(frozen=True)
@@ -304,7 +305,8 @@ class MiscData:
304305
MiscOption.UnLuckyEgg,
305306
MiscOption.DontFuckleWithShuckle,
306307
MiscOption.Fuschia,
307-
MiscOption.NewItem]
308+
MiscOption.NewItem,
309+
MiscOption.BlueBlue]
308310
)
309311
wild: Sequence[MiscOption] = field(default_factory=lambda: \
310312
[MiscOption.SecretSwitch,

worlds/pokemon_crystal_prerelease/data/data.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

worlds/pokemon_crystal_prerelease/misc.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ def safe_remove_mischief(misc_option):
4444
safe_remove_mischief(MiscOption.SaffronGym)
4545
safe_remove_mischief(MiscOption.FanClubChairman)
4646
safe_remove_mischief(MiscOption.VermilionGym)
47+
safe_remove_mischief(MiscOption.Fuchsia)
48+
safe_remove_mischief(MiscOption.BlueBlue)
4749

4850
if not world.options.dexsanity or ("Land" not in world.options.wild_encounter_methods_required and
4951
"Surfing" not in world.options.wild_encounter_methods_required):

worlds/pokemon_crystal_prerelease/rom.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
FreeFlyLocation, HMBadgeRequirements, ShopsanityPrices, WildEncounterMethodsRequired, FlyCheese, Shopsanity, \
2323
RequireFlash, FieldMoveMenuOrder, RedGyaradosAccess, TrainerPalette, PokemonCrystalOptions, RandomizeBadges, \
2424
RandomizePokegear, BreedingMethodsRequired
25+
from .phone_data import done_cmd
2526
from .pokemon_data import ALL_UNOWN
2627
from .utils import convert_to_ingame_text, rom_offset_to_address, write_appp_tokens, write_rom_bytes, replace_map_tiles
2728

@@ -886,6 +887,12 @@ def write_item(item: int, addresses: list[int]) -> None:
886887
replace_map_tiles(patch, "FuchsiaCity", 2, 15, [0x07])
887888
replace_map_tiles(patch, "FuchsiaCity", 10, 15, [0x5C])
888889

890+
if MiscOption.BlueBlue.value in world.generated_misc.selected:
891+
write_bytes([TrainerPalette.option_blue - 1], data.rom_addresses["AP_Misc_BlueBlue_SpriteColor"] + 5)
892+
text = convert_to_ingame_text("I'm blue", False)
893+
text.append(done_cmd)
894+
write_bytes(text, data.rom_addresses["AP_Misc_BlueBlue_Text"] + 1)
895+
889896
if world.options.randomize_music:
890897
for map_name, map_music in world.generated_music.maps.items():
891898
music_address = data.rom_addresses["AP_Music_" + map_name]

0 commit comments

Comments
 (0)